Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Sun, 1 Oct 2017 22:06:53 +0000 (18:06 -0400)
committerTom Rini <[email protected]>
Sun, 1 Oct 2017 22:06:53 +0000 (18:06 -0400)

Trivial merge